Merge pull request #8 from johnchase/master

added some functions
update

attemt to define functions needs work
added ipython notebook stuff.