Refactoring angular-seed template to be consistent with the others
Merge branch 'master' of github.com:aerobatic/angular-seed
Fixing merges