Merge pull request #31 from adrichman/master

track stylr-server to allow for easier commits in server_master branch