git ignore update
Merge branch 'master' of https://github.com/journeystone/rockit
database stuff