Merge branch 'master' into Brandon
Trying to remove cached dump.rdb for .gitignore
Merge branch 'master' into Brandon
Fixing merge conflicts with dump.rdb
Cleaned up .orig files
Merge pull request #28 from dancingshell/Brandon

Brandon