Merge pull request #1 from AmyWhitney/feature

move javascript
Revert "move javascript"
Merge pull request #2 from AmyWhitney/revert-1-feature

Revert "move javascript"
Merge branch 'master' into feature

Conflicts:
	app/views/account/setup/dart-tag/index.html

Did a hard reset to remove my (Eric Daza) commits, to bring in a Amys feature improvements.