Updated env file
Removed Twitter and further HAMLising
things
added a few fields to the dashboard
Merge branch 'master' of https://github.com/RhysStansfield/deal
pulled fri morning
Added AWS file upload for production and added image to offer
Guess who is back? Twitter is back
Various bug fixes and validations
Fixed conflicts
added dates to new offers
Permitted attributes
fixed tests
Unsuccessful business sign in redirects back to business sign in
Some tidying up
Merge pull request #29 from NadiDami/master

Unsuccessful business sign up redirects to business sign up
Merge pull request #28 from jamesjenkinsyates/master

AWS, HAMLising, Twitter Changes and things.
Merge pull request #30 from MBottjer/master

Ajax for customer category interests and company suggestions
Fixed Google oauth2 cucumber test
Merge branch 'master' of https://github.com/RhysStansfield/deal
updated dashboard with some more figures