Merge pull request #13 from Jonga/temp

Temp
Merge pull request #14 from Jonga/temp

Heroku stuff
Merge pull request #15 from Jonga/temp

heroku pg
Merge pull request #16 from Jonga/temp

MOre Heroku nonsence
Merge pull request #17 from Jonga/temp

Even more heroku crap
merge conflicts
merge conflicts FFS
Merge pull request #18 from Jonga/temp

Heroku
Merge pull request #19 from Jonga/temp

config
Merge pull request #20 from Jonga/temp

Who knows
ffs stop conflicting you son of a bitch
no one does
you win conflicts
Merge branch 'master' of https://github.com/Jonga/invitie
jquery stuff
jquery stuff
Sprokets
assets
server file
Merge branch 'master' of https://github.com/Jonga/invitie