Merge branch 'master' of github.com:ExactTarget/fuelux into scheduler…

…-setUTCtime

Conflicts:
	js/scheduler.js

.travis.yml

@@ -3,10 +3,11 @@ node_js:
 - 0.1
 sudo: false
 before_install:
-- time wget http://fuelux-dev.herokuapp.com/dev/node_modules.tar.gz
+- time wget http://fuelux-edge.herokuapp.com/dev/node_modules.tar.gz
 - time tar -zxf node_modules.tar.gz
 - chmod +x ./node_modules
 install:
+- time npm update
 - time ./node_modules/bower/bin/bower update
 env:
   global:

DETAILS.md

@@ -123,7 +123,7 @@ Pull requests are validate via [Travis CI](https://travis-ci.org/).
 
 Periodically pull requests may fail Travis CI build integration testing with a false negative. If you suspect this is the case you can restart the test via the command line (see below).
 
-[Travis](https://travis-ci.org/) downloads the `node_modules` folder from the "[Edge](https://fuelux-dev.herokuapp.com)" server (["fuelux-dev"](https://fuelux-dev.herokuapp.com)) hosted on [Heroku](https://www.heroku.com). If you add or update a dependency in `package.json`, you will need to also update `package.json` in `master` locally and push it to [Heroku](https://www.heroku.com) for the dependency errors to be resolved in [Travis](https://travis-ci.org/).
+[Travis](https://travis-ci.org/) downloads the `node_modules` folder from the "[Edge](https://fuelux-dev.herokuapp.com)" server (["fuelux-edge"](https://fuelux-edge.herokuapp.com)) hosted on [Heroku](https://www.heroku.com). If you add or update a dependency in `package.json`, you will need to also update `package.json` in `master` locally and push it to [Heroku](https://www.heroku.com) for the dependency errors to be resolved in [Travis](https://travis-ci.org/).
 
 ### Install Travis CI Client
 

README.md

@@ -45,7 +45,7 @@ Ensure all the dependencies are included on the page (eg, such as using the CDN
 #### The code you want is in `dist`
 A few ways available to install.
 
-- Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.11.5/)
+- Request files from [the Fuel UX CDN](http://www.fuelcdn.com/fuelux/3.12.0/)
 - Install with [NPM](https://www.npmjs.com/package/fuelux): `npm install fuelux`.
 - [Download the latest release](https://github.com/exacttarget/fuelux/archive/3.4.0.zip).
 - Clone the repo: `git clone https://github.com/exacttarget/fuelux.git`.