fix(gen): options should have descriptions

Add --help info for the options coffee and minsafe
feat(app): upgrade to Bootstrap 3.0.1
Merge pull request #429 from passy/bootstrap-3

feat(app): upgrade to Bootstrap 3.0.1
Merge pull request #409 from eddiemonge/options

fix(gen): options should have descriptions
docs(readme): remove outdated testing instructions

The testing instructions were really out of date and didn't apply anymore
fix(css): remove merge conflicts

Remove the merge conflicts from the file
fix(bootstrap): some plugins have ordering dependencies

Re-arrange ordering dependencies and trailing comma
feat(app): update to angular 1.2.0

Update Angular and its deps to 1.2.0. Also updates other deps.

Breaking changes: The gruntfile has changed slightly. Specifically ngmin
has been moved in the build order and its config targets have been
updated from dist to tmp
fix(gen): remove extra "App" from service spec files

Pull request #413 changed the way the names are handled. Forgot to
update these 4 files.
Merge pull request #439 from eddiemonge/ngupdate

feat(app): update to angular 1.2.0
doc(changelog): add preliminary changelog for 0.6
v0.6.0-rc.1
Merged with downstream
Removed redundant files