Looots of stuff
Merge branch 'master' of github.com:couchtape/couchtapeapp
Added grunt default task