Merge branch 'master' into summer_2013
Merge branch 'summer_2013' of github:garza/spomecs into summer_2013

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.