Commit 5cba4cdd0dc81f97d83b7a43dc7c7df11ce5be6b

doerrhoefer 2014-01-31T23:28:57

Merge branch 'travis'