Merge dev --> master: let's do this!
Merge pull request #16 from tsmith512/master

merging master into master
Merge pull request #17 from thebruce/master

merging master in ghpages