Bugfix: ucase >> upcase
Bugfix: two typos
Merge branch 'master' into refactor/opsworks
Bugfix: ruby code in an .erb
Merge branch 'master' into refactor/opsworks
Bugfix: require bundler to make travis happy (h/t @roidrage)