Merge pull request #1 from maxgillett/development

Merging in development branch
Merge pull request #2 from maxgillett/development

Merge in development branch
Merge branch 'development' of github.com:maxgillett/s3_multipart
fixed initialization bug
application controller inherits from main app
sessions are passed into callback blocks
readme fixes
updating gitignore
removed db
put config stuff in correct directory
Merge pull request #3 from lukesteensen/fix-generator

put config stuff in correct directory
updated readme
fixed regex bug that didn't allow mp4 files to be uploaded