Merge branch 'release/1.0'
Merge branch 'release/1.1'
Merge branch 'develop'
Merge branch 'release/1.2'
Merge branch 'release/1.3'
Merge branch 'release/v1.4.0'
Merge pull request #1 from jloveland/develop

updated atom config
Merge branch 'release/v1.5.0'
Fixes #3
Merge branch 'master' of https://github.com/jloveland/dotfiles
Bumping Ruby to 2.1.2 to resolve mavericks build issue
Merge branch 'hotfix/v1.5.1' into develop