upgrading ember
some slashes :)
temporary dependency fix to get AWS deploy to work
merging master and fixing conflicts
putting pretender back in
no sass watch :(
Merge branch 'newsfeed' of github.com:simplereach/buddybuddy into newsfeed