Merge pull request #21 from tuxedio/development

Merge Master branch
Fix merge conflicts
Resolve merge conflicts
Merge pull request #29 from tuxedio/c-capistrano

Add Capistrano deploys and db methods
Create Capistrano task lib and move tasks
Create Capistrano task lib and move tasks
meh
Add staging for future releases and create database_tasks.cap
Prettify Gemfile
Prettify README
Add info about Cap migrations to README
Change language in Views to HAML
Merge pull request #31 from tuxedio/c-linting

Organize Capistrano tasks, views use HAML, and linting
Merge branch 'development' of https://github.com/tuxedio/tuxedo-proto into development
Merge pull request #30 from tuxedio/development

Merge development to master (v0.0.1)