Merge pull request #7 from joshiste/master

Upgraded to Spring Boot 1.1.7