Merge pull request #31 from floralvikings/develop

Merge develop into master, ready for 0.1a
Merge pull request #59 from floralvikings/develop

Develop
Merge pull request #60 from floralvikings/develop

Develop
Merge pull request #61 from floralvikings/develop

Develop
Merge pull request #64 from floralvikings/develop

Develop
Merge pull request #67 from floralvikings/develop

Develop
Merge pull request #75 from floralvikings/master

Master back into develop